From e64b220791a9165ec3b542a93e6b3e07b9800ed8 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 21 May 2011 03:18:00 +0200
Subject: [PATCH] stringfuncs: Remove _gtk_css_parse_url() from header

No code changes, just moving the function in the c file so it doesn't
need to be forward-declared.
---
 gtk/gtkcssstringfuncs.c        | 116 ++++++++++++++++-----------------
 gtk/gtkcssstringfuncsprivate.h |   3 -
 2 files changed, 58 insertions(+), 61 deletions(-)

diff --git a/gtk/gtkcssstringfuncs.c b/gtk/gtkcssstringfuncs.c
index 0ec6ace610..3576e63687 100644
--- a/gtk/gtkcssstringfuncs.c
+++ b/gtk/gtkcssstringfuncs.c
@@ -724,6 +724,62 @@ gradient_value_to_string (const GValue *value)
   return gtk_gradient_to_string (gradient);
 }
 
+static GFile *
+gtk_css_parse_url (GtkCssParser *parser,
+                   GFile        *base)
+{
+  gchar *path;
+  GFile *file;
+
+  if (_gtk_css_parser_try (parser, "url", FALSE))
+    {
+      if (!_gtk_css_parser_try (parser, "(", TRUE))
+        {
+          _gtk_css_parser_skip_whitespace (parser);
+          if (_gtk_css_parser_try (parser, "(", TRUE))
+            {
+              GError *error;
+              
+              error = g_error_new_literal (GTK_CSS_PROVIDER_ERROR,
+                                           GTK_CSS_PROVIDER_ERROR_DEPRECATED,
+                                           "Whitespace between 'url' and '(' is not allowed");
+                             
+              _gtk_css_parser_take_error (parser, error);
+            }
+          else
+            {
+              _gtk_css_parser_error (parser, "Expected '(' after 'url'");
+              return NULL;
+            }
+        }
+
+      path = _gtk_css_parser_read_string (parser);
+      if (path == NULL)
+        return NULL;
+
+      if (!_gtk_css_parser_try (parser, ")", TRUE))
+        {
+          _gtk_css_parser_error (parser, "No closing ')' found for 'url'");
+          g_free (path);
+          return NULL;
+        }
+    }
+  else
+    {
+      path = _gtk_css_parser_try_name (parser, TRUE);
+      if (path == NULL)
+        {
+          _gtk_css_parser_error (parser, "Not a valid url");
+          return NULL;
+        }
+    }
+
+  file = g_file_resolve_relative_path (base, path);
+  g_free (path);
+
+  return file;
+}
+
 static gboolean 
 pattern_value_parse (GtkCssParser *parser,
                      GFile        *base,
@@ -746,7 +802,7 @@ pattern_value_parse (GtkCssParser *parser,
       cairo_t *cr;
       cairo_matrix_t matrix;
 
-      file = _gtk_css_parse_url (parser, base);
+      file = gtk_css_parse_url (parser, base);
       if (file == NULL)
         return FALSE;
 
@@ -868,7 +924,7 @@ slice_value_parse (GtkCssParser *parser,
   char *path;
 
   /* Parse image url */
-  file = _gtk_css_parse_url (parser, base);
+  file = gtk_css_parse_url (parser, base);
   if (!file)
       return FALSE;
 
@@ -1222,59 +1278,3 @@ _gtk_css_value_to_string (const GValue *value)
 
   return g_strdup_value_contents (value);
 }
-
-GFile *
-_gtk_css_parse_url (GtkCssParser *parser,
-                    GFile        *base)
-{
-  gchar *path;
-  GFile *file;
-
-  if (_gtk_css_parser_try (parser, "url", FALSE))
-    {
-      if (!_gtk_css_parser_try (parser, "(", TRUE))
-        {
-          _gtk_css_parser_skip_whitespace (parser);
-          if (_gtk_css_parser_try (parser, "(", TRUE))
-            {
-              GError *error;
-              
-              error = g_error_new_literal (GTK_CSS_PROVIDER_ERROR,
-                                           GTK_CSS_PROVIDER_ERROR_DEPRECATED,
-                                           "Whitespace between 'url' and '(' is not allowed");
-                             
-              _gtk_css_parser_take_error (parser, error);
-            }
-          else
-            {
-              _gtk_css_parser_error (parser, "Expected '(' after 'url'");
-              return NULL;
-            }
-        }
-
-      path = _gtk_css_parser_read_string (parser);
-      if (path == NULL)
-        return NULL;
-
-      if (!_gtk_css_parser_try (parser, ")", TRUE))
-        {
-          _gtk_css_parser_error (parser, "No closing ')' found for 'url'");
-          g_free (path);
-          return NULL;
-        }
-    }
-  else
-    {
-      path = _gtk_css_parser_try_name (parser, TRUE);
-      if (path == NULL)
-        {
-          _gtk_css_parser_error (parser, "Not a valid url");
-          return NULL;
-        }
-    }
-
-  file = g_file_resolve_relative_path (base, path);
-  g_free (path);
-
-  return file;
-}
diff --git a/gtk/gtkcssstringfuncsprivate.h b/gtk/gtkcssstringfuncsprivate.h
index 4911a7a71c..8b47770194 100644
--- a/gtk/gtkcssstringfuncsprivate.h
+++ b/gtk/gtkcssstringfuncsprivate.h
@@ -29,9 +29,6 @@ gboolean                _gtk_css_value_parse              (GValue        *value,
                                                            GFile         *base);
 char *                  _gtk_css_value_to_string          (const GValue  *value);
 
-GFile *                 _gtk_css_parse_url                (GtkCssParser *parser,
-                                                           GFile        *base);
-
 G_END_DECLS
 
 #endif /* __GTK_CSS_STRINGFUNCS_PRIVATE_H__ */
-- 
2.30.2